Skip to content

USHIFT-1235: Fix docs for RHEL DVD file names to be of the 9.2 version#1770

Merged
openshift-merge-robot merged 1 commit into
openshift:mainfrom
ggiguash:doc_fix
May 8, 2023
Merged

USHIFT-1235: Fix docs for RHEL DVD file names to be of the 9.2 version#1770
openshift-merge-robot merged 1 commit into
openshift:mainfrom
ggiguash:doc_fix

Conversation

@ggiguash

@ggiguash ggiguash commented May 8, 2023

Copy link
Copy Markdown
Contributor

Closes #1758

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 8, 2023
@openshift-ci-robot

openshift-ci-robot commented May 8, 2023 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@ggiguash: This pull request references USHIFT-1235 which is a valid jira issue.

Details

In response to this:

Closes #1758

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci Bot requested review from dhellmann and pacevedom May 8, 2023 16:55
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2023
@openshift-ci

openshift-ci Bot commented May 8, 2023

Copy link
Copy Markdown
Contributor

@ggiguash: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@dhellmann

dhellmann commented May 8, 2023

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2023
@openshift-ci

openshift-ci Bot commented May 8, 2023

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, ggiguash

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 35eb143 into openshift:main May 8, 2023
@ggiguash

ggiguash commented May 8, 2023

Copy link
Copy Markdown
Contributor Author

/cherrypick release-4.13

@openshift-cherrypick-robot

openshift-cherrypick-robot commented May 8, 2023

Copy link
Copy Markdown

@ggiguash: #1770 failed to apply on top of branch "release-4.13":

Applying: Fix docs for RHEL DVD file names to be of the 9.2 version
Using index info to reconstruct a base tree...
M	docs/devenv_cloud.md
M	docs/devenv_setup.md
M	docs/devenv_setup_auto.md
Falling back to patching base and 3-way merge...
Auto-merging docs/devenv_setup_auto.md
CONFLICT (content): Merge conflict in docs/devenv_setup_auto.md
Auto-merging docs/devenv_setup.md
CONFLICT (content): Merge conflict in docs/devenv_setup.md
Auto-merging docs/devenv_cloud.md
CONFLICT (content): Merge conflict in docs/devenv_cloud.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix docs for RHEL DVD file names to be of the 9.2 version
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ggiguash ggiguash deleted the doc_fix branch May 9, 2023 05:30
This was referenced May 9, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dhellmann dhellmann Awaiting requested review from dhellmann

@pacevedom pacevedom Awaiting requested review from pacevedom

Assignees

@dhellmann dhellmann

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG] Documentation uses incompatible Go versioning

5 participants

@ggiguash @openshift-ci-robot @dhellmann @openshift-cherrypick-robot @openshift-merge-robot